]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
texture-cache: Simplify function with g_autoptr
authorGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Thu, 24 Jan 2019 18:02:30 +0000 (16:02 -0200)
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Thu, 24 Jan 2019 18:23:58 +0000 (16:23 -0200)
st_texture_cache_reset_texture() is slightly easier to
read and follow by using g_autoptr, so use that.

src/st/st-texture-cache.c

index d0c49960b23f56c9d399e19926fc03622db48fcf..ad177b35eb28775e37756a25b99bc7ea79877101 100644 (file)
@@ -658,8 +658,8 @@ st_texture_cache_reset_texture (StTextureCachePropertyBind *bind,
       (cairo_image_surface_get_format (surface) == CAIRO_FORMAT_ARGB32 ||
        cairo_image_surface_get_format (surface) == CAIRO_FORMAT_RGB24))
     {
-      ClutterContent *image;
-      GError *error = NULL;
+      g_autoptr(ClutterContent) image = NULL;
+      g_autoptr(GError) error = NULL;
 
       image = clutter_actor_get_content (bind->actor);
       if (!image || !CLUTTER_IS_IMAGE (image))
@@ -677,15 +677,9 @@ st_texture_cache_reset_texture (StTextureCachePropertyBind *bind,
                               &error);
 
       if (image)
-        {
-          clutter_actor_set_content (bind->actor, image);
-          g_object_unref (image);
-        }
+        clutter_actor_set_content (bind->actor, image);
       else if (error)
-        {
-          g_warning ("Failed to allocate texture: %s", error->message);
-          g_error_free (error);
-        }
+        g_warning ("Failed to allocate texture: %s", error->message);
 
       clutter_actor_set_opacity (bind->actor, 255);
     }